From: Wei Liu Date: Mon, 5 Sep 2016 10:36:45 +0000 (+0100) Subject: tools/firmware: Rename bios.bin to seabios.bin X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~473 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/%22bookmarks://%22Dat/%22http:/www.example.com/cgi/%22https:/%22bookmarks:/%22Dat?a=commitdiff_plain;h=b2f2ced591060588a45cdc7881a7335ba42b9cc5;p=xen.git tools/firmware: Rename bios.bin to seabios.bin bios.bin as a name is far too generic. Rename it to seabios.bin. Signed-off-by: Andrew Cooper Acked-by: Wei Liu [ wei: fix up conflict, rerun autogen.sh ] Signed-off-by: Wei Liu --- diff --git a/tools/configure b/tools/configure index 998090afb3..7b223051a0 100755 --- a/tools/configure +++ b/tools/configure @@ -4453,7 +4453,7 @@ if test "x$seabios" = "xy"; then : cat >>confdefs.h <<_ACEOF -#define SEABIOS_PATH "${seabios_path:-$XENFIRMWAREDIR/bios.bin}" +#define SEABIOS_PATH "${seabios_path:-$XENFIRMWAREDIR/seabios.bin}" _ACEOF diff --git a/tools/configure.ac b/tools/configure.ac index 1fb4a55b85..f010d7233e 100644 --- a/tools/configure.ac +++ b/tools/configure.ac @@ -224,7 +224,7 @@ AC_ARG_WITH([system-seabios], ],[]) AS_IF([test "x$seabios" = "xy"], [ AC_DEFINE_UNQUOTED([SEABIOS_PATH], - ["${seabios_path:-$XENFIRMWAREDIR/bios.bin}"], + ["${seabios_path:-$XENFIRMWAREDIR/seabios.bin}"], [SeaBIOS path]) ]) diff --git a/tools/firmware/Makefile b/tools/firmware/Makefile index cf09ad2ea8..b840c6ab87 100644 --- a/tools/firmware/Makefile +++ b/tools/firmware/Makefile @@ -42,7 +42,7 @@ install: all [ -d $(INST_DIR) ] || $(INSTALL_DIR) $(INST_DIR) [ ! -e $(TARGET) ] || $(INSTALL_DATA) $(TARGET) $(INST_DIR) ifeq ($(CONFIG_SEABIOS),y) - $(INSTALL_DATA) seabios-dir/out/bios.bin $(INST_DIR)/bios.bin + $(INSTALL_DATA) seabios-dir/out/bios.bin $(INST_DIR)/seabios.bin endif ifeq ($(CONFIG_OVMF),y) $(INSTALL_DATA) ovmf-dir/ovmf.bin $(INST_DIR)/ovmf.bin